From: Florian Müllner <fmuellner@gnome.org>
Date: Wed, 6 Nov 2013 22:40:22 +0000 (+0100)
Subject: popupMenu: Fix removing the active menu from PopupMenuManager
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~3066
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=52b1a1b835f17e17dd938cc4140fa4168c67b5bf;p=gnome-shell.git

popupMenu: Fix removing the active menu from PopupMenuManager

Commit b42af9aa991eba5 changed the parameter list of _closeMenu()
to account for changes in the GrabHelper ungrab mechanism, but
didn't update other callers.

https://bugzilla.gnome.org/show_bug.cgi?id=709806
---

diff --git a/js/ui/popupMenu.js b/js/ui/popupMenu.js
index efff7f338..4a46d2f73 100644
--- a/js/ui/popupMenu.js
+++ b/js/ui/popupMenu.js
@@ -1114,7 +1114,7 @@ const PopupMenuManager = new Lang.Class({
 
     removeMenu: function(menu) {
         if (menu == this.activeMenu)
-            this._closeMenu(menu);
+            this._closeMenu(false, menu);
 
         let position = this._findMenu(menu);
         if (position == -1) // not a menu we manage